Merge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 3 Dec 2005 09:44:38 +0000 (10:44 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 3 Dec 2005 09:44:38 +0000 (10:44 +0100)
commit2e611ccc2241c22c2e6a41e662de6b758b364bcd
tree49d300437012883a9dea2e6a7ff52982c57b2e04
parent023c80945bf81825ab5c26ba33cd493a9ae4cc3b
parent25df6829ebc3eeeb56c6cea8a3376d510581d7b3
Merge with xen-ia64-unstable.hg